Merge "Validate allocations against mappings" am: 9b52891918 am: 5e07981095
am: 7c595b7a3f

Change-Id: Ic43aa2c5f664cbabfb9559f6727275e3415625d6