Merge "Remove need for check script in test 1937"
am: ccfbcc8567

Change-Id: Ia13262b5f1f58d91a747edc93c180ccd509105a8