This reverts commit 8ac1971678. Reason for revert: Didn't remove automotive changes from this CL. Merged-In: I8608c8f636c35f21e4246a805a9eff6d14124e0a Change-Id: I1c660cffc8817ad0b33da9f6eceb3d88e7c48416
8ac1971678