Merge "Revert "Add shim app for CTS testing"" into nyc-dev