N-MR2 N2G47H merge '384007ac74283c1487e5eee27446a26cce3ce78c' - clean

Change-Id: Ib4c8c241399c00401d634ae563dfa382e57c7b8c