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

Change-Id: I7bacb1907eee4fd2b8240e71b46364d89146dd8b