Merge changes If28f0be6,If0f80067 am: 96529ad7fc am: cf77c50b11

Change-Id: I3d554c7ac0cf77aa2a80655d77c0e5bfb737dbdc