[automerger skipped] Merge "DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master" am: 5219d21e31  -s ours am: 0479cb7060  -s ours
am: dbd3849bd8  -s ours

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