Merge 9e6dc0c4bc4787d4e2d504836ddb0e2a11c90bc3 on remote branch

Change-Id: Iee5f89c6980019ebbda627f2c6d434ffa5d42dbb