Cherry picked changes from master

Bug: 158349179
Test: Verified the changes
Merged-In: I6a4be4fb6a351234e79f7b3977bed5859a062a71
Change-Id: I832103f2d8420d78c49a26efba927f0f15a3181b
3 files changed
tree: 4cd4e93382270e854a769e4a55577a200035c732
  1. acts/
  2. tools/
  3. wts-acts/
  4. Android.mk
  5. OWNERS
  6. PREUPLOAD.cfg