Merge changes I6643c9ee,Ibd412b26 am: b5708a93b1
am: 5a3a6fa004

Change-Id: I475304dba37b9da75569ea322e607b67b9e01781