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

Change-Id: If3a859736a1b3730e4e3d0d2685f3e5432927796