ASALIGHT-125, ASALIGHT-88, ASALIGHT-135

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