Merge changes Ic2e27f56,Ie19e0995
am: 95f507f80d

Change-Id: Ic17794934d93e771c9537760c1bada5ff6a5765a