Snap for 6374617 from fe295735335c6e51af11d092392785b9c20b672f to mainline-release

Change-Id: I252ad5b62ed86d63d4b93990377613033719c3c1
tree: d936c54387ff77d2a50fb2d1362033eb2464a4b9
  1. framework/
  2. OsuLogin/
  3. OWNERS