* upstream svn@326827 Test: git diff 860fc25e == git diff 53df1a50 1c4bd6a3 Change-Id: I4af60289c0e56604f06799c21afe08c099641b6b