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

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