Merge "Fix typo and inconsistency"
authorRyota Mibu <r-mibu@cq.jp.nec.com>
Tue, 24 May 2016 10:22:53 +0000 (10:22 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 24 May 2016 10:22:53 +0000 (10:22 +0000)

Trivial merge