Merge commit f26c8d18976

* upstream svn@323906

Test: git diff f26c8d18976 ==  git diff 05ba328 c9dec13
Change-Id: If992e433888af8b631b54abd4dc81258d9462e89