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