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

Change-Id: I881ceb928c0cf8663b0de5f2451846bfe39f2090
tree: 5233a7cfa9d8ebdb1e05bfccf0bcdf4c5a0d9cb7
  1. core/
  2. services/
  3. tests/