* upstream svn@326829 Test: git diff 195a1646 == git diff f56176dd 04d162f7 Change-Id: Id4feb4fe7cf03b2ad96c31345b089a20699b4214