Merge 648f3b7aa691533ec417a6daa21bfcba01509126 on remote branch

Change-Id: Ieb833417eac732fc732fb4cc98165e67470b57ca