am ba58657f: Merge "fix SOX in clearFocus" into honeycomb

* commit 'ba58657f269b289186764c5b9ba4bd42318033d8':
  fix SOX in clearFocus