Merge changes If633f16b,I40d7ecb1 am: e93f65efc6
am: 4b105920d5

Change-Id: I333adba24aa173284b28ffa7d69281e9290f1657