Merge changes I5c5c4eb3,I36712447,I5b78d449 am: fd5241f120 am: 2d5bf0b845

Change-Id: I02040c779e3537d02389a7c6408761122dcad284