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

Change-Id: Iad1cac097a43c9b10fff9b0bb9625af5053eca04