* upstream svn@323978 Test: git diff ec2d1867 == git diff c376c270 0d648894 Change-Id: I4b8dd75f8b78c56203274689753c7d3d2e1b8a37