Merge commit 'ffc625793b55ea7f8e511b9362a88b6ba080c983' into HEAD
Change-Id: I5e1c168b3ba4ee897793ef13f98bfe95a2fa5486