Fixing Policheck and test errors

(cherry picked from commit d9561be3f7fff925256c36f90ec3fde53e8cbe8b)
Fixing policheck violation

(cherry picked from commit 3489bf29cd2331f0c8cb33c96f75472b55f1d135)