Merge "DO NOT MERGE Add running time hints to CTS package config" into mnc-dev am: 0e4cf34f73 am: 23c9de03cc am: bf1dcfff89
am: 06a665dbe3

* commit '06a665dbe3e44f5a2efeb46116acc01cec983bff':
  DO NOT MERGE Add running time hints to CTS package config