Merge in from AOSPA-legacy 4.4.3