* upstream svn@328903 Test: git diff e7408fe3 == git diff 860fc25e 0c1c1aa8 Change-Id: Ia44205dc5c17eb34f4b62e0209987f3458a29a29