[TIC-CORE] Merge remote-tracking branch 'origin/develop' 50/119050/1 v20170316
authorChulwoo Shin <cw1.shin@samsung.com>
Wed, 15 Mar 2017 08:45:41 +0000 (17:45 +0900)
committerChulwoo Shin <cw1.shin@samsung.com>
Wed, 15 Mar 2017 08:45:41 +0000 (17:45 +0900)
Change-Id: I7ba5b0fec7976448699facb3d07b958f86be9ca2
Signed-off-by: Chulwoo Shin <cw1.shin@samsung.com>

Trivial merge