Merge mainline-release 6664920 to master - DO NOT MERGE

Merged-In: Id04ea331831e8b26ba99478848392b40a92548d5
Change-Id: I888da0c9475f2d00602d917d2f58169f8d7c93a4
tree: e56002cb3a2db4d84093146a2313b3766dfa4055
  1. framework/
  2. OsuLogin/
  3. OWNERS