Merge branch 'master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Wed, 20 Jul 2016 04:56:17 +0000 (13:56 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Wed, 20 Jul 2016 04:57:08 +0000 (13:57 +0900)
Update sync with master in which cloud interface branch is merged.

Change-Id: Ib79964b58bb4253337524d5fb18278cc66943363
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Trivial merge