ASALIGHT-130, ASALIGHT-133, ASALIGHT-134

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