N-MR2 N2G47H merge '4095f560e99340241b4f659fcae5548675d96e53' - clean

Change-Id: I5c31d1258e01d08f45aac81ab00e310d7643ee27