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

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