automerge: 8a23b38 * commit '8a23b3820d6f4d08b6b6ca3ffb0f85bd829f5e97': Remove 2 sub-tests from the internal test app.