Merge changes I3f69e410,Ieccf3b8e am: 5e705a5636
am: 305edd2d4c

Change-Id: Ib513393a6bac365a49ea8d8e02bef2c8bdd74cc3