Merge "Apply non-FBE migration early during boot." into nyc-dev
am: 599de361cb

* commit '599de361cb7832fec18a51a62cbf44af4df27020':
  Apply non-FBE migration early during boot.

Change-Id: Ie6823d6211ee9851d30f53f47204ac6a063d0aae