Merge changes Ia3a03ec1,I2de66d2a
am: 837780ea25

Change-Id: Iefc859ad68ddf104721d3955418c3dd51bebaa94