Merge "[Security bug fixes] Added mac address & country code len check"