Merge "Only restorecon CE storage after unlocked." into nyc-mr1-dev