Merge "Improve handling of android auto classes."