Merge 15b1485e49cef4bee9c2b915e9bff3ef69158b73 on remote branch

Change-Id: Ia987dc951fea730aad4b3dee72d7d661b68a7ded