Merge "have OffloaderController store and re-push more state" am: 69efc596af am: 7a5dd80c95 am: cf0c15b54d
am: 157906f73d

Change-Id: Ib0f1fd39fb5b690108f82b5d8a932f44bfc6df60