Merge 1ed4a96b81cf0873bf13be2d6bf14a897ce6266c on remote branch

Change-Id: I0b44286464b620d5e927116f5f038f6ce40f0cf7