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

Change-Id: Ib2be0591aba3b4a2f6b06becc9cd3f5de1a40532