Merge "JUnit additions for BRMS,POLICY-SDK-APP"