Merge "Port the current code to new IncFS" am: e2ce10ceeb

Change-Id: I69f9529d94f680e757393b232a0671ce81fd5875