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

Merged-In: Ib34dec9c96fefebccee0665f2db3df3f919e52d8
Change-Id: I7e0e9c81b8f9b3e606ee6d3b837054cc849fadb3