Merge diffs from API review comments(2/2).

Change-Id: I7316ec4fe134268927b27c14e421e6e3fc31b59f
4 files changed