N-MR2 N2G47H merge '47c74c47a0fd85235576dc66d1da05f70e78aeed' - clean

Change-Id: I8f8c689a16a118f3659db206e7e89444b1966bf5