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