Merge "Update to match changes in pom2bp arguments"
am: a9fd19d60c

Change-Id: I7868cb86cd8b8f23629d1a50bfa2f389186ab804