Merge "Respect Accessory timeout value when restoring defaults" am: 3ddf22e69c
am: c37036d164

Change-Id: Id6feac7351a4627c0a4a90b67899ee2c1aa469e8