Merge 166f3de5c0e9ce09fbdfac09b77196a0d82c8d07 on remote branch

Change-Id: Ia3be66a2752a1c5e002bdc12ee0c799a7e62f52a