Prevent GNL from crashing on JB

issue 17433546

Change-Id: Ie5071e516b26400a27473eaaa401023f1af1d840
2 files changed