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