Merge "Preserve existing pom2bp behavior"
am: 0e07c1f9ed

Change-Id: I6b527031574f4f992b3e8677983cfc03c90fa98b