am faa702dc: Merge "Initial changes to make folders accessible" into ics-mr1

* commit 'faa702dca81afa700dddaa01b2a73774085db515':
  Initial changes to make folders accessible