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