Merge changes Ia43d6dae,I09ec7969
am: f03997b7f2

Change-Id: I147769b7f712c08df15511e6a33afc7b1c887845