Merge "Revert submission from topic "separate-testing"." am: 567b03aa72
am: c12a9e9b26

Change-Id: I09b3d512212216308afa45c9d48cc9d1a1dc61c4