Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9

Change-Id: I4fa3f771fe93e9b6024828d9c725502629c1ccff
tree: c432dceea806ae2418910fd01a8032c907d7e8a2
  1. Tethering/