Merge changes I15abdf13,I70304168,I52b0cb8e
am: a23ce83a3b

Change-Id: I706cd1c1c940b9a3b2bd27db0181fe47eb565e08