Merge "Address comments from API review." into qt-dev
am: b5b7312195

Change-Id: I03264085fd6aa0e3d250c6535354c1b5bef68596