Merge 7b39f236b9623c396c37e08a326efcc403704590 on remote branch

Change-Id: Ifc994f908667eeeca21583117539893bbcd58470