Merge commit 'e08839c2e6a1b607abbba902ad0d578f8147f6fc' into HEAD

Change-Id: Ia49a7b76ecc99c27b48806f063416451b3df3904