Merge 6280d8ffa2191fbd47f12b204711d9f4d2975854 on remote branch

Change-Id: I9270c440ee7a61d4c3b78abe79daf093a9ebe748