Change-Id: I15c23a3445ab1cbc92c4c1258f37844bf244ebf0 Partically-implements: blueprint better-reconfigure