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

Change-Id: Ieb1e982053c046a1e524019b077e9142a049446e