N-MR2 N2G47H merge '25afa85b84721d9028e1fe44c183cbfd2c15407d' - clean

Change-Id: Icfcee38a91b12bad923323b143fbe2fc4727b77d