Merge commit '576526abed4ec754506fa3417f69fb0b57967dab' into patch_branch

Change-Id: I63b3030b9d396c33e4f176037d3d11e840334aee