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

Change-Id: Id0c2646d53e8210043a175d1d9e401824c02d846