Merge changes Ib7b71b78,I62fd4d40 am: 9d354e41cf
am: f74980150b

Change-Id: Ia8f2a17046237e807485fb964cb571d86d22ade5