Merge "Modify the offline handling interface." am: bc8446992f am: c6f7a32ada
am: 4b4c251aaf

Change-Id: I4da3da1f8a618b8d46c2bbb622408e095361f5ac