Merge "Fixed below issues found during IPA bring up:"