Merge \\"Only restorecon CE storage after unlocked.\\" into nyc-mr1-dev am: 96f387e8c0
am: 91404d9481

Change-Id: I909f1697562f390b58cf08cc9b17e566cde7d73c