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

Change-Id: I42d487805a75d76ce2a777d08b627e1f7920187d