Merge changes Iaa6f0d65,I68a16b64 am: 3590350620

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