Merge changes from topics "api-fix-networkagent", "satisfiedby" am: 90c292b13e

Change-Id: I1149e5d0c93885d401817d65af02b6ae47f51dfc
tree: 3a31a9e443517ad969bbfb0a19c4585de2e2e1f6
  1. framework/
  2. OsuLogin/
  3. OWNERS