Merge commit '4dfa9a7008529e7351f673c437f58348e7f1e6d1' into patch_branch

Change-Id: I36cf5407c53a6291024df96b883da31e73cc8eb7