Merge commit 'eba77c28efea76ab6280b21fa1e93abcf4dc4647' into patch_branch

Change-Id: I38ac7208d8062f4c529a48acb6f94c6fc53a04c3