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