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

Change-Id: I0b36a9dd8c3d12ea645c213104a2a6808b84a9be