Merge 0124306f1a6982d6c0f09e755b23d6687fc22ec4 on remote branch

Change-Id: Ie0ac21eda34a4f1d256cfa151ed8611846257b67