am 48112876: merge from open-source master

Merge commit '4811287623e6cbd9a3584828087ea414454dbfc5' into kraken

* commit '4811287623e6cbd9a3584828087ea414454dbfc5':
  Removed Calls to deprecated APIs and unused imports