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

* commit '124315c8b614d14155e0e303a6128076b0ca2c1f':
  Removing invocation of banned API