Merge 86ba7b122e419f0b6c0c10958e43469253549756 on remote branch

Change-Id: Ifaf4f8fed6299f56e470a7fc578418f72efae741