* upstream svn@328901 Test: git diff 95561668 == git diff 195a1646 93adc857 Change-Id: I63ca64260b4ea89bfcf557bae0e0d6288457a547