Merge "Cleanup after change Vehicle permission" into pi-dev