
Closes-bug: 2069197 Fix conflict Change-Id: I07f0b4f939d44a51056e1662b8c1263a9d62ec5a Signed-off-by: Elisamara Aoki Goncalves <elisamaraaoki.goncalves@windriver.com>
Closes-bug: 2069197 Fix conflict Change-Id: I07f0b4f939d44a51056e1662b8c1263a9d62ec5a Signed-off-by: Elisamara Aoki Goncalves <elisamaraaoki.goncalves@windriver.com>