am 4547e528: merge from open-source master

Merge commit '4547e5284e79192373f3a6bb6c452501171bc1d6' into kraken

* commit '4547e5284e79192373f3a6bb6c452501171bc1d6':
  Removed Calls to deprecated APIs and unused Imports