Merge "Validate allocations against mappings"
am: 9b52891918

Change-Id: Icd406448a92876a34d66d83924f6cfff944df65a