Fix boot loop when upgrading direclty from L to N
am: bfc7faaf35

Change-Id: Iaaf32f1c6fd70dd394252f963d87897899fb2e55