Double commit to lithium

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