Merge "Fix the build failure with enabling DEBUG_PSS" am: 0b2044a91c am: 97b5903575
am: 7e7fa3073c

Change-Id: I602b04f5ed75803df6c626de368463dc3f23d784