Merge "Carve out automotive device"
am: a570465074

Change-Id: If252cdb67ce49ef96814e29ca722e3f30841b2ed