Merge fef031e2b6ea783ba3807136a398d055f03faa30 on remote branch

Change-Id: Ice90917b21bbb52bcd595d3d176e1abbd70f93c5