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