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

Change-Id: Ib51b230e98abc9e7689dc6b3d3df77d8b8219620