Merge "Merge "ASM Priority Boost Tool" am: 8ff8dd16cc am: 8ac18ceb8a" into oc-dev-plus-aosp
am: 643275b838

Change-Id: Idb669d7b381f8291fb44dcc5a4d1824d118319d9