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

Change-Id: I998a4f2c8509815cf75e0b03e51831b325fbbea5
tree: 7eb65d0ff469105f1b9b13ca134f43056777cbc9
  1. framework/
  2. OsuLogin/
  3. OWNERS