Change-Id: Ibf68583e3acbf02a3974e766481f20b640319d8a
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@nokia.com>