Merge 445f39bcf180660c2e2a532cc7cae644336ae587 on remote branch

Change-Id: Ifccf9474f02e9a1256d08985488df77424d1e767