Merge commit 'c113258c92cefc6539058424c24e131bd6b31471' into HEAD

Change-Id: If2d55e604488d914bab1f1056d895114feaa1f01