Merge commit '07f63d938d0a7b95ad427fa7f71d31e1a741bd18' into b77882292

Change-Id: Iefc2eddb5a4d0836c935921b4569d2527d2dbadd