Merge "Fix test app installation issue in e2e test." into tm-dev