Merge 01877f9e6e46c3ca58db27c305cdc6b6d252a6c9 on remote branch

Change-Id: I8f1f8be0646e23ad4eabfa0b975ef0e3f4747221