f62: Adapt from beyond0lte

Change-Id: I7b0d8848c15fd9de151f28804750a1e23cd579c1
12 files changed