Merge commit 'f22d9cd819bf8b21bedba3dedcfa08fe8f91a15e' into HEAD

Change-Id: I0a0f6a3057951735943b846270c2d445e5cb4c7b