Merge changes Ibb4b4ca4,I31572afa am: 0a86d01080 am: 87e084a077 am: 4be2b134e6

Change-Id: I7b93150c061649c9104f25480fe2fde4eedadbc9