Bug:34116213 Bug:29748723 Test: CTSVerifier in a separate CL. Change-Id: Ie652505ff57665f626712c67837577833f1595d6 (cherry picked from commit 82ed31c1)