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

* commit '0935f258dc2fd1eeadf9d502abbd1e409f68ac67':
  Updating API based on feedback