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

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