Merge "Revert submission from topic "separate-testing"."
am: 351b5c83c2

Change-Id: Ia7b90ce375d30f6e4fd4ac33adbc0db3f13b162b