Merge "Fix the build failure with enabling DEBUG_PSS"
am: 0b2044a91c

Change-Id: If28f7c90638f104e67acda8fd0340272180e05cc