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

Change-Id: I60ff7bd1f7c96748e2848f4e58cdc604f22a1827