Merge commit 'cbc74c986b0418bb6b5a9cb4741a7569937fe3e4' into patch_branch

Change-Id: I0b828830d458958b486cdbf003c9abb41357dd96