am e5456645: am 840590dd: Merge "Fix issue #7311376: Add API to allow apps to know if they are..." into jb-mr1-dev

* commit 'e54566457869a15d606870c230662b76c02456cb':
  Fix issue #7311376: Add API to allow apps to know if they are...