N-MR2 N2G47H merge 'e74c3ea1e2dfb81eeef00ecc399ef78c37fe7868' - clean

Change-Id: If64bbcbc29d798fb17ed49848ca14e774307dd2a