am d9bd0886: am aee7225e: Merge "Process base APK" into lmp-mr1-dev automerge: 554a6f5

* commit 'd9bd08864eaf9d8847d974eadb81806b9e086a2d':
  Process base APK