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

Change-Id: I96e92da2ba3160a4d87a057535528e31515cead2