Merge 122966f4b27f763467d727c7c26cd43a7f139728 on remote branch

Change-Id: I702f3e1ed11be8f362a993c35d3eb7bd9b8e7f0c