am f486bf30: am 124315c8: Merge "Removing invocation of banned API" into honeycomb

* commit 'f486bf3069531d7db038e8982b6d79d57c9b8bf9':
  Removing invocation of banned API