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

Change-Id: I4331d9771f13bb87ef30b6aef7bd958cea62d9f4