Merge "Followup to CL 1103896"
am: e4713e7f18

Change-Id: I1eb784a8266880260d75ca109c7d78f180333a0e
tree: 2327c2234594cb3ee626299850c59fbcd5c3fe6b
  1. core/
  2. services/
  3. tests/