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

Change-Id: I5fe3e5d0e1b955a279646c6d1701f79c1700a773