am c30a6712: Merge "Show regulatory info within a ScrollView" into jb-mr1-dev

* commit 'c30a6712f266b9d4cf0c68b4a708ae6ae95911f4':
  Show regulatory info within a ScrollView