Merge 45b1741dd55eabfe674dc8ce6fd3f825553c18ad on remote branch

Change-Id: Idb110bf3dd78cfb5191fe395cbefd0443e1d1d54