Merge "add 32 bit requirement back because of regression from CTS"