(cherry picked from commit 145d2c08e057b8cedfa3e2fc459cd86aa224c185)

# Conflicts:
#	targets/RT/USER/lte-softmodem.c