[automerger skipped] Maximum value of uint32_t should be UINT32_MAX instead of ULONG_MAX am: 937551c7d1 -s ours am: 28af21208c -s ours
am skip reason: Change-Id Ie71f5a57fad298a9cb035b5e7430af617b438ab8 with SHA-1 937551c7d1 is in history

Change-Id: I12889ca6a70139433b493cb0c2c01260e79221ed