Add some missing pieces for AASP.