Merge "Merge branch 'master' into notification-service" into notification-service
authorUze Choi <uzchoi@samsung.com>
Tue, 26 Jul 2016 00:39:12 +0000 (00:39 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Tue, 26 Jul 2016 00:39:12 +0000 (00:39 +0000)

Trivial merge