Merge commit 'cd670aa2e2d9213e2ef55cc39203a21d9b4184fa' into HEAD

Change-Id: I00ae6424a8229e75d4122e4bdffba03f04d4d244