Merge 1eef77aad5a6a51ae7f543c2546fb98bf195ff28 on remote branch

Change-Id: Ied1278f46dfd7d5c7ba1e391bf8c37e59c3b7a33