Merge "logical -> dynamic partitions."
am: b22bd959e5

Change-Id: I1a22ef028bd75ffd7595a378ef48451c2779d5ae