Merge "Add more tests for dynamic partitions" am: 6bddf40d31
am: 21c8507179

Change-Id: I0a15c5b2376b9e7176d01a18be6bf3391de5e45c