am 78591e35: am 0456ca4e: Merge "DO NOT MERGE: make sure new added tests are only in CTS-flaky test plan" into klp-dev

* commit '78591e35099b8358bf98d892f01a3f80a17cfd76':
  DO NOT MERGE: make sure new added tests are only in CTS-flaky test plan