Merge "have OffloaderController store and re-push more state" into oc-mr1-dev am: 1dd52a8017
am: 48db1fb74f

Change-Id: If9afc160fa2f8b5da66cb0a6a35dfcb4f1839d36