Merge changes I5adc737f,I492c2c54,Ib72e4d82 am: 8e2689864f

Change-Id: I51653fdbad1fa117fb77e1abd1b470c537e87633