Merge \"Rename problematic entries.\" into nyc-mr1-dev
am: b892b69e29

Change-Id: I8e39dac689f96593daa190c526079770fc2469aa