Merge "qahw_api: Propagate missing changes from 2.2.c4 to 4.0"