ASALIGHT-126 ASALIGHT-127, ASALIGHT-92

Change-Id: I2395bc62dbabd64b1c303fde4697b819d79d252d
Signed-off-by: Padmapriya Narayanan <padmapri@qce.qualcomm.com>