[TIC-CORE] Merge remote-tracking branch 'origin/develop' 04/122004/1 v20170331
authorChulwoo Shin <cw1.shin@samsung.com>
Thu, 30 Mar 2017 02:06:47 +0000 (11:06 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Thu, 30 Mar 2017 02:06:47 +0000 (11:06 +0900)
Change-Id: I0ac4cd472b5aa29c706c201437c9d5528fd1e42b
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

Trivial merge