Merge "resolve controller cannot talk to consumer in fuel"
authorTomi Juvonen <tomi.juvonen@nokia.com>
Mon, 22 Aug 2016 14:12:08 +0000 (14:12 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Mon, 22 Aug 2016 14:12:08 +0000 (14:12 +0000)

Trivial merge