[automerger skipped] Merge "Rename setConverted." am: c078236faf am: 636a4a31bf am: 3829f323f0
am: 1252e25f71 -s ours
am skip reason: change_id I806a4a60e61eb4e7e5c18a22424c30ab7404692c with SHA1 80be55c636 is in history

Change-Id: Idd0f463d13336516179704c03057aba68b64e007