am 854042c5: am 8e5bd029: Triage CTS plans

* commit '854042c560fc43511352304bd18aebebc2048a2c':