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

Change-Id: I0a966698855aa935b6acbf3829988d5004ff57e2