[automerger skipped] Merge changes from topic "netstack_constant_cherrypick" am: 1cd0dcc4a9 am: f1d5385bde -s ours am: 646d8669db -s ours
am skip reason: Change-Id I7855090bffbe895c8349ad4903b8f2eb55515f0b with SHA-1 b8fecf4b32 is in history
Change-Id: I061d479fc4ff068f248bcef944e801cae022ffc8
This commit is contained in: