[automerger skipped] DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master am: 23303aff5e  -s ours
am: 37ae56a0f4  -s ours

Change-Id: Icf77675866d843c8d6d5cc30ea1a5f1d8f0cfba7
tree: bd32cb53ef80bd2e7d8cfda22275817279590f65
  1. framework/
  2. OWNERS