Merge 5b6d92adb80b7479d771978fefa5fc472d39b933 on remote branch

Change-Id: I3c66713d94ae2639160b9e01ff3f3a63b1ad61af