Fix boot loop when upgrading direclty from L to N am: bfc7faaf35 am: 492f5263a4 am: 873c99c30b
am: 5adffe2c77

Change-Id: I9ae16f0de5b6f71d8343db369528c27a40d36be4