Merge "Merge branch 'master' into cloud-interface" into cloud-interface
authorJee Hyeok Kim <jihyeok13.kim@samsung.com>
Tue, 19 Jul 2016 13:26:22 +0000 (13:26 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Tue, 19 Jul 2016 13:26:22 +0000 (13:26 +0000)

Trivial merge