Merge "API changes for 64 bit platforms."