Merge changes Ie7318b61,Ie0d350f2
am: c85814676d

Change-Id: Ibf495f39e93998a542a02bb74413f13f508d3811