Migrate doEdit() to doEditContent()

Change-Id: Ic695786089fa4e74ed9453ff2859c74e355926ba
Merge "Migrate doEdit() to doEditContent()"