[automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 341fa568b9 am: 88e1e454b9 -s ours

am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 438018d1c0 is in history

Change-Id: I278c197256ccd394636c8283a5988ad57b5d7bfe