Tracking my own development & cmfilemanager

Change-Id: Id2656b82224982dbb9de9ff5fa43a1b76beb6242