Merge "Raman is not on Android team anymore." into main