Merge "Add reserved AID ranges for all partitions"