[automerger skipped] Merge "Fix performance degradation from BootSequence atom" am: 2be430aceb
am: f43ab6f5b3  -s ours

Change-Id: I6fc4d4887fd81f2285e8101014307821bd415c0c