Merge "PDL: Use underscores for field names"
am: 86939cc6d5

Change-Id: If3963204dc87892e5771e18e2c93f85e43ee2a5c