pr-13222-a49e22 vs. 2412-31 / vk-lin-mesa / sf-assault-flashing

pr-13222-a49e22 (a49e22e1) Diff 2412-31 (ada646a7)
Failure ee4199684f2550207e26ecc8a4fc90926c88bd93
Failure 23af8121af1404108dcca69376112698dbfbfcc1
Failure bff7b388222c0960f916a094c64ea8bc6899d40d