Merge "Update to match changes in pom2bp arguments"