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

Change-Id: I8f79dbb1f9d4a0d95619a14e45b45b9ff1a78a95