Merge "Fix Automated API Review issues." am: a793b48cf0 am: 9a9dac2b98
am: d29d268abe

Change-Id: I1968eb36c2f4fafd33846ec0f91710c665d936e6
tree: 58e81013f08d712d58b171e191086eb72d39280a
  1. core/
  2. services/
  3. tests/