Updates required to move the code to ARC.
Conversion to ARC.
Merge branch 'ARC'