Merge 4223a2d775bf44afa5955ebc86192ccd2eca7412 on remote branch

Change-Id: If4919c19824efb9e6071419492a3c54d1716f509