N-MR2 N2G47H merge '785fcc792435085229d1216d3394c84a4a1a8b19' - clean

Change-Id: Ibafda0de9bd72b76d18a15b16985f0217314745b