Follow up to Ie1a853b634fe3ecc7e71e54a967e4b4795126f85

Edit link still doesn't work.

Change-Id: Ia3d8a62934ff554cba026e2b9d7b06212179ef40
Merge "Follow up to Ie1a853b634fe3ecc7e71e54a967e4b4795126f85"