[automerger skipped] Maximum value of uint32_t should be UINT32_MAX instead of ULONG_MAX am: 937551c7d1 am: a302d02ec7 am: 8e3611df8b am: 608c820e83 -s ours am: 91ae820082 -s ours
am skip reason: Change-Id Ie71f5a57fad298a9cb035b5e7430af617b438ab8 with SHA-1 937551c7d1 is in history

Change-Id: I83a7819fcc6e89f74a7b97920d843f5453b87965