Merge commit 95561668f063

* upstream svn@328901

Test: git diff 95561668f063 == git diff 195a164675a 93adc857a633
Change-Id: I63ca64260b4ea89bfcf557bae0e0d6288457a547