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

Merged-In: I0b18ac95c96a5b0d8180b0f91b45e50a57010fdb
Change-Id: I885bb5f30d4795a1630740f7cff246c4696d9825