Merge changes I4af73809,Iba6a564a,I3305b71e am: 5640e1d836 am: 91ccb1b309

Change-Id: I9a7b50482d2354710f85141fec0bbf9d980b4711