Merge "Add features for Automotive usecases."