Merge 8f78a2470c2b46560855c577453d247241ba6999 on remote branch

Change-Id: Iaaf83c8b5cd631007a24ade414f2468ac8915e11