I'm adding some other modules in a follow up, and to avoid creating a large messy bp file, do some re-organization ahead of time. Bug: 184839225 Bug: 185128417 Test: m Change-Id: Icd655e680f7138582ddf34fb0e0e78e9bdd7a927