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

* commit '0e4cf34f7379a19647fc39c56b1a37551bb362c0':
  DO NOT MERGE Add running time hints to CTS package config