Change-Id: I14e1619f8fd33be5b0652982131c2a4a4b3e1292
Partially-implements: blueprint better-reconfigure