Merge "Fix performance degradation from BootSequence atom"
am: 2be430aceb

Change-Id: I25adf53300d2e46123178db1e214945d7cc799a6