Android CTS 13.0 Release 4 (10119802)
Merge "Revert "Make apexer replace instances of version placeholder str..."" into tm-dev