Add new adapter int_or_none, which allow the int field to be None. Change-Id: I200108aac951fb9e52f6977340a4870cee7f887b