HR-235 - hrui - Degrade gracefully on 4.4