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

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