Merge "Cleanup CTS test for parcelling of Region." into nyc-dev am: 989f5808c9 am: 08a5166b2f am: 1262b2ef08 am: d62873e436 am: 280e46b9ba
am: c93f7d63e5

Change-Id: Ie005952328b7545c265f0122fb4ec036c79dcda2