Merge 3b241337848e09d12c1da83402659092e485937b on remote branch

Change-Id: Ibedec75abd1ad2603e090ca46577949f22d8f9ad