Merge "Update to minSdkVersion 19 for tests." into main