Merge aaa5259a5eee35081539d1abdd2839fe2533868e on remote branch

Change-Id: I69a1b91196078481eba8cc2351cafca086458e4c