DO NOT MERGE - Empty merge of tm-dev-plus-aosp-without-vendor@8763363

Merged-In: Ia17d91cc878d106e9b2adeddafe35a71105e1663
Change-Id: I3e8c41b80f32d3a4ac5312f3c23809f4479d8e7a