Apollo: Prevent FC in cache initialization

Patchset 2: Remove unnecessary sleep
Patchset 3: Revert original comment

Change-Id: I1594e2001bdfef282d010399e70f1f0066ec4c06
JIRA: CYAN-1996
Issue: https://jira.cyanogenmod.org/browse/CYAN-1996
Signed-off-by: Jorge Ruesga <jorge@ruesga.com>
Merge branch 'cm-10.2' into martincz