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

Change-Id: Ie6809bd88ad77c622152fb9a48c54178ee1868ee
tree: 159f8b211d807574ca75b2e42e848bc884e18e29
  1. tests/