Change-Id: Iab025ed796e807aab0315a583a04ed8865fc0d44
Reviewed-by: Daniel Molkentin <daniel.molkentin@nokia.com>