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

Merged-In: Iff91700f6b56acf29e434a966f6a32418e22f862
Change-Id: I66f1f450321ae40bec1e4537f19daab1d469e64b