Merge 07b4711f5fac3214db18c2b90c1c64da9820e6d1 on remote branch

Change-Id: Icd778946e7d709e4da5d479ffd1933abff422884