Merge commit 'edb4f3367276b44d9fd5040856b7cf98f1b85bf1' into HEAD

Change-Id: Ia71415cd6896a5650f3f73b810b8b5eec7bf3960