Merge "logical -> dynamic partitions." am: 10654730a4 am: 4b358da722
am: 972a7e9713

Change-Id: I4dfcb8cd634528748898740e49767c55080bdcf4