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

Change-Id: I0e8565e79456d229ff5d90114a9df3e14aea314c