Merge "DO NOT MERGE Add running time hints to CTS package config" into marshmallow-cts-dev