Merge 16df098bb67003b2cc41d744b5551d2db96dfe46 on remote branch

Change-Id: I4d9eae8d0cc14d9952e972298e68edfa50d33616