Merge "Disable MASS by default" into devel/master
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 8 Nov 2017 17:48:33 +0000 (17:48 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Wed, 8 Nov 2017 17:48:33 +0000 (17:48 +0000)

Trivial merge