* upstream svn@326802 Test: git diff c8069755 == git diff 24c7353a e0ca3648 Change-Id: I18291d16b06e858a8e7c110100c867b1bd326ac1