Fixed NonEmptyValidator to work with all devices.

Bug: 65275
Change-Id: Ibc38a971c3583321ebc23415d4cbc8469bc37a5a