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

Change-Id: I6543fd3bf2bc8f91a3b0490f5a3ede26e93dc794