Merge "ASM Priority Boost Tool" am: 8ff8dd16cc
am: 8ac18ceb8a

Change-Id: I68f86f307368de6870a7d649118d1a0f8c744a88