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