am 8e56a75d: Merge "Cleaning up folders for 7-inch and 10-inch UIs" into jb-mr1-dev

* commit '8e56a75db48d8d62d7defbb64d91e03d430ae67c':
  Cleaning up folders for 7-inch and 10-inch UIs