N-MR2 N2G47H merge '8a764b54002d26c01e2c7cd5aa0d038dfe0623bd' - clean

Change-Id: Id4eb5e54bd91ce35054cd70f762ecb5b23c07d12