svn 328901 branch point
Merge commit e7408fe366bb

* upstream svn@328903

Test: git diff e7408fe366bb == git diff 860fc25e85a 0c1c1aa856d9
Change-Id: Ia44205dc5c17eb34f4b62e0209987f3458a29a29