Merge "add 64-bit requirement for linux bug: 26288626 am: 584d18b am: 40ed41b am: affdf51" into nyc-dev