Merge commit 96f2a40217bb

* upstream svn@328819

Test: git diff 96f2a40217bb == git diff f8988e8e88b8 5383c119dd1
Change-Id: I4c9a3b9d0814fd2d7c7797e50bf211c61738b6f7