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