Reduce spurious diffs with upstream.

Bug: 9469682
Change-Id: I69260ab36fa5eb02c979cea38d0ed2e100e1acbb
2 files changed