am 04b646df: Merge "Possible NumberFormatException of parseInt is outside try-catch"

* commit '04b646df1e9f00719d2d547fa1da59407bb6be67':
  Possible NumberFormatException of parseInt is outside try-catch