Merge commit 0533f7494bb4

- upstream svn@r328900

Test: git diff 0533f7494bb4 == git diff ec2d1867560 c3e804f8b243
Change-Id: Ib3800b8535ebd31621823351d0dd71dbb37559cb