N-MR2 N2G47H merge '47c74c47a0fd85235576dc66d1da05f70e78aeed' - clean

Change-Id: I626b0e0f2d92f08b3232c936196571380806ec55