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

Change-Id: I5d315bf170184c65d2713c4be55170bab1eb42f6