Merge commit 'b8a30aff1e8cbf8e8d690fdf7812b89954496b0b' into HEAD
Change-Id: If54800869e200680e963984842b8dcc3d28b8425