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

Change-Id: Ic6d1c57b21bca6dc91f7c24a0fcbe11619364e57