Merge remote-tracking branch 'origin/master' into merge_API4
authorWonyoung Choi <wy80.choi@samsung.com>
Tue, 9 Jan 2018 04:33:00 +0000 (13:33 +0900)
committerWonyoung Choi <wy80.choi@samsung.com>
Tue, 9 Jan 2018 04:33:00 +0000 (13:33 +0900)

Trivial merge