Combined below gerrits: 4391641 4314831 Signed-off-by: Bhushan Thombre <quic_bthombre@quicinc.com> Change-Id: I79120af4efca665da7e734a358565a58f7062a1d