Android S Beta 1
Merge "Add comment explaining why we need custom logic to parse int"