In preparation for code deduplication with CTS. Bug: 32072923 Test: m Change-Id: Ibbe005c94252bd29eae7f88aad301b0b20ddb80d (cherry picked from commit 3f46c965)