Merge "Ensure that android is restarted when setting sysprop flag." into tm-dev