Merge 22da7b757b989ff6df0bc732265bd5a5847a61ac on remote branch

Change-Id: Ie6e4c41a2b28fbea4cf6b19ad08425e52798f25f