Merge "Fix honeycomb password in dg.properties"