CMFileManager: Lollipopification

Change-Id: I1702cf147b8ebc68f3a24175fa34cf397d823280
Merge branch 'remote' into mkl