Merge "Update for hidl adapter module defaults."