Merge "Sync up latest code" into devel
authorhyokeun <hyokeun.jeon@samsung.com>
Tue, 12 Dec 2017 02:36:35 +0000 (02:36 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 12 Dec 2017 02:36:35 +0000 (02:36 +0000)

Trivial merge