[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master
am: 0911727a11  -s ours

Change-Id: I60ae19c5ff7d5de669fac1ebd93d48283d9f27d8
tree: f612da649e42ea46f33dc52ee101ac042c0f9538
  1. core/
  2. services/
  3. tests/