Merge "Replace android auto assets with the latest" into nyc-mr1-dev