A little refactoring to keep most everything for these "temporary" flags in one place. Bug: 5348373 Change-Id: I257aac616ae635e6f9d9dffd692357b4c08037e2
531bed61