Merge "Support new regulatory label for location" into qt-dev am: 28736bee5d
am: 920f6109a8

Change-Id: I22c607437953b5f87fa30d5f53715535ab2e363c