Merge cherrypicks of [3907239, 3907816] into pi-release

Change-Id: I90cbf2491df8c8606b9744aa732647ec26d3bddc
tree: 912fc0201bf248d28b4d1fbe5cf13314d86af623
  1. core/
  2. services/
  3. tests/