Merge 818dacd2345041fd13ab96b5beefa1480689a519 on remote branch

Change-Id: Ieeac07a0eb54d217801f1c305ee65591fa13d2b1