Merge "Fix improper patch rebase"
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>
Wed, 25 May 2016 16:14:12 +0000 (16:14 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Wed, 25 May 2016 16:14:12 +0000 (16:14 +0000)

Trivial merge