Merge commit 'd823ab13bdbf58d36ff74481842aa1d1673f9ac7' into HEAD

Change-Id: I1e3c00c525a6b82ea7c94bcb0a0eebdae0615c0f