Merge changes I5b1a1ce0,I483a18f9
am: 9349b72a67

Change-Id: Ia2a70526d7fd97a45d62f896f6e3888c9df3e982