Merge 15b192c602aada3603578b30a6cfc4df6bfa0c98 on remote branch

Change-Id: I9284adc3ca82f33256318c38277ccb85498bfca6