CMFM: NL translation reorganization

Change-Id: I68d0c9fcf677191a77ffc1a5e1e2fb3c02efd1c9