Merge commit 'c71a806a39c81b1d4bf62b27ecc3bb809d341bef' into HEAD
Change-Id: I91c681182aa1fd1f0d1ec3deeb2ca33cf73bbb27