Merge changes Iee2984f7,I18a3fd8a
am: a1d7b197b8

Change-Id: Id0011b65b4f066c98f3e494c507d6d8ff404bdab