am dd240d9a: am 0935f258: Merge "Updating API based on feedback" into jb-mr2-dev

* commit 'dd240d9a30578930bbf63b6bd9998e940dd16160':
  Updating API based on feedback