Merge "Merge branch 'master' into extended-easysetup" into extended-easysetup
authorMadan Lanka <lanka.madan@samsung.com>
Wed, 3 Aug 2016 13:53:44 +0000 (13:53 +0000)
committerGerrit Code Review <gerrit@172.30.200.205>
Wed, 3 Aug 2016 13:53:44 +0000 (13:53 +0000)

Trivial merge