Merge "Rebased patch due to upstream changes"
authorStefan K. Berg <stefan.k.berg@ericsson.com>
Fri, 9 Oct 2015 05:09:08 +0000 (05:09 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Fri, 9 Oct 2015 05:09:08 +0000 (05:09 +0000)

Trivial merge