Merge 979d3274a11377ced05a9db23a2d5a793c4d877d on remote branch

Change-Id: I178b22571760159bfcd2d45a247de353b54160a4