Change-Id: Id3c88257e866923b06e878ccdeddded7f08f2c98
Instead of setting a custom property and checking via isset + count. Change-Id: I087eeb2eee414218bbd6023ad1703fde22292281