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