Merge "Integrate in cl/356241895 into testRcsApp"