Merge 1ee96066e865c2f5cb1676b0682e0790c1dc2a42 on remote branch

Change-Id: I03f53bcba24f322f739dc1c4c33be91438d9c16c