Merge ab/6749736 in stage.

Bug: 167233921
Merged-In: Iecef31f7bf10ad97b7e0075cf302ae94e248474a
Change-Id: I9e9c873bc2e05a0cfe3af0bf74725500f3f108db
tree: 7b0fc691b97cda6b387ef5fddc67622c24740be8
  1. framework/
  2. OsuLogin/
  3. OWNERS