phsen_abcdef_dcl bug fixes

Change-Id: I552a1ab150920b67bda48d02806ee739b6fc473a