Merge "Modify the offline handling interface."
am: bc8446992f

Change-Id: If934f7a4c8244544a2f7dfa71d213122f5d37137