Merge changes Ibfe10b43,I984d1ea9
am: d94c24222b

Change-Id: Ie2beb34b400299bedac632f4830b4b0fd436550b