Merge 53cda49c15710347327c122238d55db92ec0e83c on remote branch

Change-Id: I641445e9edfb32ef91f41815b02010eedb3ddbfc