Merge a3312257226570e3f8afd830b2eefc3a1bb19bed on remote branch

Change-Id: Ic917fc97a00b00a7f0c9f17d2e9aa120982f6fd2