Merge changes Iaa6f0d65,I68a16b64 am: 3590350620 am: 85273c6cb9

Change-Id: I7e66156659fb88110d2a7f027d488e15499caee2
tree: c90d0096b2cc0e8f4957429111256d3059d4eac4
  1. framework/
  2. OsuLogin/
  3. OWNERS