Double commit to stable/helium

Change-Id: I568760e79ec4db96f10f0a4b39e41f64c9420033
Signed-off-by: Shuva Jyoti Kar <shuva.jyoti.kar@ericsson.com>