Change-Id: Ia127e29fd07bf01eb817e3d319d56f17854b09c9
Partically-implements: blueprint better-reconfigure