Merge 45b1741dd55eabfe674dc8ce6fd3f825553c18ad on remote branch

Change-Id: I06d20f1b71276fe94973039755c31f45cd667630