Change-Id: I0808b32115989ed55bf5401d2f5401930766d39a Partially-implements: blueprint better-reconfigure
Change-Id: I2e2b840676456abcb0dddea05864ad69f1c6b397