Merge changes I1f2c9bfe,I38a92abb am: aedfe936ef
am: a843f717c9

Change-Id: Iff0aa535bcc024bb819168fed1f9d3a8f05dae40