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

Merged-In: I017fd9cc381b5c446782d39a2007a24e274f8e9d
Change-Id: I6f995a24faa568f8704788d30e8d6911471533cb