am b6711ac0: am 0f668f3c: Prevent GNL from crashing on JB

* commit 'b6711ac01cfc7ac507e6c01c0aba4670178a5cab':