Merge changes Ic8b33ce8,Ied6f13e5
am: 1ccd01feb7

Change-Id: Icda8de70affb2a8459c3f519aa2c1ee5b36aa01f