Merge abe5f96f8852ce65772d08c399a00f47010cb10d on remote branch

Change-Id: Ie3e19a87fcc2371b64f59ca6cd52027120c7398e