Snap for 6371019 from 6f2fc99fbd543302f40049fd6c493a676cda4406 to mainline-release

Change-Id: I077942e37c7aa4ca802240ecbe1b0237249b97ba
tree: ef93f366661ec4f8086d2d54cf0664b01ed2301c
  1. framework/
  2. OsuLogin/
  3. OWNERS