Merge commit 'fb1ebb7e41c0e41aa7a87f32e3557a908f9e8118' into HEAD

Change-Id: I0b8409a2da4d4dd1596a449ea96e8d741d8e55dc