Merge "Fix atoi build errors" into qt-dev am: 9fe4ba7a43
am: 4ab10d710e

Change-Id: Ic2aabbd11ad77f748ba37336d221f36d9e8e5fe8