Merge "Updating build.gradle and template-params for MNC samples" into mnc-dev