Fix compiling errors in P

Change-Id: I989c21a93a3e6e3a2b488cc94b0929ed3c74e4f9
5 files changed