Merge stab branch on top of dev brnch

Change-Id: Ib4aec4e8527829edfb38535414acfa4180ccf5ca
CRs-Fixed: 988658