Merge "Add KEY_TYPE_OFFLINE support."