Fix Car Service Test crash. am: b92031d26a
am: 833d50f2ac  -s ours

Change-Id: Ida600465dfb75c8e92e2194ab85a99d729ef995a