N-MR1 NMF26V merge '675e212c8c6653825cc3352c603caf2e40b00f9f' - clean

Change-Id: Ib220a9c7cec77d4f341a8e9a05339d9f4e8f231a