Merge commit 'b3ef447e82a42e7fe84e6ee81b7f44a07d9345d0' into HEAD

Change-Id: I28853201cb405133779886ea1a3c2282ca4ec0fb