[TIC-CORE] merge master into develop 52/125452/1
authorChulwoo Shin <cw1.shin@samsung.com>
Mon, 17 Apr 2017 08:40:29 +0000 (17:40 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Mon, 17 Apr 2017 08:40:29 +0000 (17:40 +0900)
Merge remote-tracking branch 'origin/master' into develop

Change-Id: I518ca1f188792aea8825f10f078ea6d096a23e37


Trivial merge