Propose r1338810 for backport.
Propose r1338810 for backport.

git-svn-id: f31f7a5323bbe4a1034a732b81b9abb714edbfbf@1338844 13f79535-47bb-0310-9956-ffa450edef68

wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion,wbond/subversion