Merge "Fix wrong offset in environment array"
authorStefan Berg <stefan.k.berg@ericsson.com>
Wed, 27 Jan 2016 15:41:30 +0000 (15:41 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 27 Jan 2016 15:41:31 +0000 (15:41 +0000)

Trivial merge