Merge commit 195a164675a

* upstream svn@326829

Test: git diff 195a164675a == git diff f56176dd98a 04d162f71f6
Change-Id: Id4feb4fe7cf03b2ad96c31345b089a20699b4214