Merge commit 565ba0415b6b

- upstream svn@328507

Test: git diff 565ba0415b6b == git diff 89cdbc2e15cc f26c8d18976
Change-Id: I631ab42bb70c97b7b90b68e2b773d584ebc603a1