Merge 16df098bb67003b2cc41d744b5551d2db96dfe46 on remote branch

Change-Id: I57199f3a00aaf80c653f2e857de4e69124afbcd2