Merge changes If54fa3a8,Ie7bd1459 am: 166c3aa030
am: dab15ff5f8

Change-Id: If68ce4578c30fdb1e5d87f67bcaaec125f647b2c