Merge "Lint fix: IS_DEBUG_DEVICE: Implied default locale"
am: 1194b218d6

Change-Id: I51e1d74955d14d631e90c5c70c7375ccb9d18470