Merge "Fix race condition new regions in AllocNonVirtual" am: 9a1c4b4d28
am: 19966cbc2c

Change-Id: Ica4544f0a6e2d738cdf773988d1208429ed14e2c