Merge "Cleanup after updating Vehicle permissions" into pi-dev
am: 8b73c1126a

Change-Id: I5687a87169717d7dd55166c2b0c2a57aecbfa452