Merge b52a10a9799decf2a140aa9f17a9c28573b7ec4d on remote branch

Change-Id: Ie6b955337b2ccbb7141752277eb2e8ad52bb5e20