Merge commit '5a7c8db7c01134185889dcf58202d5998635f8d1' into patch_branch

Change-Id: I14553b8e1d916748d2a34b79323cf86bc0cab969