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

Change-Id: I17d511e5de50f927d705b9e1c56f6f05f787043a