am 351f7817: am 21af9a08: Merge "avoid multiple-"0" to exceed the length of upper bound"

# By Sungmin Choi
# Via Android Git Automerger (1) and others
* commit '351f7817e555f52571e72751bb452a715495f010':
  avoid multiple-"0" to exceed the length of upper bound