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

Merged-In: I0d8d2b9434e1bd30215ff43aded93ef4894551b5
Change-Id: Icebbde03416169aedba0d38e5df277d296d68522