Initial base for live folders

Change-Id: I76b8065b88e4a51d33e802fc8b80911f703f025a
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2