Merge "Fix Automated API Review issues." am: acb5eca325 am: f1f3b08982
am: affa3f497d

Change-Id: Iba1630161579571d4975aba9bbd5c767f82c8a98
tree: 4d1a1576681634d23d0bce6cda8e55bd21251441
  1. core/
  2. services/
  3. tests/