Merge "pal: fix Static Code Analysis issues"