Merge 1713686c4250e52066bee9c5b4838b6a11490662 on remote branch

Change-Id: Ie9a49fdbaf29345d012da1c24edb6f0399e02bb5