Merge a3cec3dda6ccd87984f1fec5d2ecfe5dd976a686 on remote branch

Change-Id: I94e03f7d22cfa779a73dc064017f9016af610054