Merge 6b3aea8578e45387a6bb5049bfc0231148dff670 on remote branch

Change-Id: I9f4e0a2488aaa9981ef05555b53fcbcea0c31451