Merge changes I3d68dbf8,I6ea524bb,I978d9119 am: edab226d0e
am: 6fe110fa36

Change-Id: Iebc6a31b975fd7ba429bd9bae89cd9783776d1c3