Merge changes Ia7ecd0e1,I33982473
am: 4a066a2cd2

Change-Id: I07c077d4d174cdbdf6675e34680b3eb2705ee303