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

Change-Id: I4de366196f91ef1fe17c617a117b29503f8f68e1