Merge 8d94d4a0cd488be50e7590c50180be8caa4f354e on remote branch

Change-Id: I7d965b83ab41050e70313901e6bb074614a6eb4c