- upstream svn@328507 Test: git diff 565ba041 == git diff 89cdbc2e f26c8d18 Change-Id: I631ab42bb70c97b7b90b68e2b773d584ebc603a1