BT: Compatibility Changes for P branch

Adding backward compatibility changes on p branch
to accomodate new feature changes on shared
keystone branch.

CRs-Fixed: 2351423

Change-Id: I4d6561159a866033aedd39a9657f08ff78d89959
1 file changed