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

Change-Id: I8f2b51ea302039dfb2f8005baada9d336d9fc39c