Merge changes Ib6ffcc38,Ia58e6bc1 am: 3068a85962 am: 5da565a85a
am: c4c3cc2ee9

Change-Id: I3f5443dbc7098f0cad17d16b4adc084064097bf1