Merge 0980dd2cd7553e5c8193f9ff22290b7a8ace1745 on remote branch

Change-Id: If0333a947323283876d288b4bd3e9050e0af1ae9