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

Change-Id: Id7ad5059a27c61166d32f09a45995689791c47d4