Merge 1c3842b50bf8bf1a492a4ded559b79b005eb7de1 on remote branch

Change-Id: I46b666e1446405fb1e642bdabc402c3590e8064f