Adds 64 bit support Change-Id: I6db3c4f68bf2c337bff753599af193e2b062ec05
Change-Id: Idc934ed8ae17aba3300e4022e9b42177b0907e9d