Merge remote-tracking branch 'origin/master' into notification-service
authorHun-je Yeon <hunje.yeon@samsung.com>
Tue, 23 Aug 2016 03:55:18 +0000 (12:55 +0900)
committerHun-je Yeon <hunje.yeon@samsung.com>
Tue, 23 Aug 2016 03:55:52 +0000 (12:55 +0900)
Change-Id: Ifc4d229deb7d96800790c617536d96b9ad25136c
Signed-off-by: Hun-je Yeon <hunje.yeon@samsung.com>

Trivial merge