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

Change-Id: I60ae19c5ff7d5de669fac1ebd93d48283d9f27d8
tree: bc56f63bd19c60ccd1ad0c20cb4d65e692c584fa
  1. framework/
  2. OWNERS