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

Change-Id: I9617284d09ec85c699d12045a8761b97b226b795