Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: I84c06c89ceb70b56c73632de31265095a7fbcb3c
Change-Id: I86f853c3b8f93f9934078d0d2fdc6505cfe176ab
tree: 8ee914fb9bae7b4cb91e969275eeb4fad0ab08e9
  1. apex/
  2. service/
  3. metrics_pdd_hook.py
  4. PREUPLOAD.cfg