Merge 50ee2a510af3f2d64ca59dd3d5a4e6366edc0f8c on remote branch

Change-Id: Ibfe5474c1211ad057fe1981ca7fc514a2afc06b6