[automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 10adc9a7b9 am: 4a2454f475 -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 aa5dfd816a is in history
Change-Id: I278c197256ccd394636c8283a5988ad57b5d7bfe
This commit is contained in: