Merge "Process base APK" into lmp-mr1-dev