one instance was overlong leading to a int64->uint32 conversion warning Change-Id: I56d5ab75d89960c79293f62cd489d7ab519bbc34 (cherry picked from commit 03d12190552c3e95d31aa00303f28a8a2f813bdd)