Merge "Fix typo according to API review." am: c83e37317f
am: 8585a4556c

Change-Id: I459cb3a98b8349ac4b9ae12024feca51e2c8b916