Merge "Update atoms with the final API constants" into qt-dev
am: dd3667e8bb

Change-Id: I3a65c14066fcd4be767ccfcd9cf94e31bf8eb7cf