... instead of unless + test command, to leverage the built-in feature and simplify the logic in our own modules. Change-Id: Id9b6bc78f225ddca2ce9580b38a02351c2fbdd35