Merge commit 'f233b47cd9cf173860df44591eea3cd29f35979d' into patch_branch

Change-Id: Icbfb3909b2b7da471d70521dad29eee566e0b17e