Merge 46e41307eee1f3c0694b5ebaf15a22f87e70e4ac on remote branch

Change-Id: Ie4e7d76e7fcb69ec8938756ebbb80ba55dc7df2c