Merge "logical -> dynamic partitions."
am: 10654730a4

Change-Id: Ic71216f9002ff6dda79e76ddff67516e8824506a