Merge "Rename setConverted." am: c078236faf
am: 636a4a31bf

Change-Id: I7f539c645d80bf9c10a014652121963446139ac2