ASALIGHT-127 ASALIGHT-92

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