[automerger skipped] Only retain for 64 bit. am: d3a7616aa2 -s ours am: 1e79f023e8 -s ours am: 002ab15677 -s ours am: 2413e29bc4 -s ours

am skip reason: Change-Id Iaec8276582f880145a1ca5ebbaa65789f46d2bf2 with SHA-1 d3a7616aa2 is in history

Change-Id: I2df4e5c6e8d5436d5d42cbb282c316561a6e2d07