Merge 0980dd2cd7553e5c8193f9ff22290b7a8ace1745 on remote branch

Change-Id: Ibc04f6d039c4ca66d89f2b23273e81e92ba9b9e6