ASALIGHT-122, ASALIGHT-111, ASALIGHT-139

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