- upstream svn@r328900 Test: git diff 0533f749 == git diff ec2d1867 c3e804f8 Change-Id: Ib3800b8535ebd31621823351d0dd71dbb37559cb