Merge commit '2b6ea1dec1b937c92511866f14358cc8e986b2ac' into HEAD
Change-Id: I046cb13a9106b32326f44e8aa605d649dcb613a7