Merge 46f2f0b1e70a31ebe038bad2e6e6297647c0e790 on remote branch

Change-Id: Ic33c08561b2d4d04bf3392485ab47668ce58e0b2