Merge 4818e37215d74a83d5af520255a52ea0cbc748b1 on remote branch

Change-Id: I89d8ed1e034f10677a2082ec26ab2e656a7ca1a8