Merge "Merge branch 'master' into notification-service" into notification-service
authorUze Choi <uzchoi@samsung.com>
Fri, 2 Sep 2016 13:02:03 +0000 (13:02 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Fri, 2 Sep 2016 13:02:04 +0000 (13:02 +0000)

Trivial merge