DO NOT MERGE - Merge Car SetupWizard lib fixes from master am: 295d984e56

Change-Id: Id3bbab4d11de7a91d09554a4bdf068c15b234238
tree: f36cbe55ddc0845d18d613b6ff12a85bd9aa8bd8
  1. OWNERS
  2. PREUPLOAD.cfg
  3. library/