Merge 7e12387f48c42ca191fd62704283c74154524283 on remote branch

Change-Id: I43222020fb8f3061a7060a11324f31a769d4c322