Merge "Revert "Revert submission from topic "separate-testing"."" am: addcc36534
am: 97a11fb8ab

Change-Id: I368ccb483ba72c8fea622a3179c7e22aa7d7ab7e