Merge "Add API to support ASL-in-APK" into main