Merge changes Ie7a5303e,I2b3c2ac4
am: 3a052c42be

Change-Id: Ib8a9ca85340333b3fd093cdae364e5add5631f6e