Snap for 6520975 from bd9221b7d6b7652b6385ca2b0ed9eb4b6bdb49aa to mainline-release

Change-Id: Ib0a4a009571bc90ae7765a4ce9061bc92abd9297
tree: b26b8a3587cabab143793fcae24aa2474487103b
  1. core/
  2. services/
  3. tests/