Merge "Carve out automotive device" am: a570465074 am: 3454338c22

Change-Id: Ie73d37a9a2488d64beb3ba8bf3003048db957390