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

Change-Id: I96973800d02ae55270c63939cc8b890c78c967f3