Merge "Avoid Svace DEREF_OF_NULL warnings" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 30 May 2017 09:51:28 +0000 (09:51 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 30 May 2017 09:51:28 +0000 (09:51 +0000)

Trivial merge