Merge bdde767bb633c1944a96c66f1309bec50250a6b3 on remote branch

Change-Id: I542849f8ae7136bbfd608ba5dc90324677b7e04d