Merge changes Ib26d7840,Id07f05de,I65755b5d
am: 9532aa9928

Change-Id: I5584f78af210e302b2b18d059b92cccc9ff225c8