Merge changes I15abdf13,I70304168,I52b0cb8e am: a23ce83a3b am: fc9a804cab

Change-Id: Ie19d4d94745ada9d3c70869b0c72264863db0952