Snap for 6470414 from 877bb4207740e2de8aca100fd731644f1d73f81f to mainline-release

Change-Id: If65a16ac6013c010de1664a788df927fbbca850c
tree: fd7f9518303804750a6c45c69a22b6366a1dd8c8
  1. framework/
  2. OsuLogin/
  3. OWNERS