after rebase Change-Id: I95f0bb00e14030e7728d8f53ea6afa1fcab70e54 Signed-off-by: Henry Castro <hcastro@collabora.com>
Signed-off-by: Andras Timar <andras.timar@collabora.com> Change-Id: If138cec6f66b7dcf213766b20831d68af42b10ea