Merge commit 'c40b2a8ef6dc1e0603ee7f5266f552ef81cce7e7' into HEAD

Change-Id: I48184f39ffb985668afcb865fedc41b234320954