Merge changes from topic "netstack_constant_cherrypick" am: 341fa568b9

Change-Id: I4fa3f771fe93e9b6024828d9c725502629c1ccff