Merge changes from topic "fix-legacy-android-test-spam" am: 22bd015cba
am: fdc58270ef

Change-Id: I2f6dca4843d6f61efee1577ba5e88d16844cfbfe