Merge changes Ic70b3479,I3f7f7795
am: 5189773ce6

Change-Id: I2692fa25690146e37f02b35f8c5cf07861eb39ac