Fix boot loop when upgrading direclty from L to N am: bfc7faaf35 am: 492f5263a4 am: c78751707c
am: 4f74f3fd58

Change-Id: I30611734d78d3c3604cb3ef18ee732fb1ccc93b2