p1: p1l + p1n = p1ln (fusion)

Change-Id: Ie23b9f9f3f87eab5fb64e323edc2a5811453ccf9
Signed-off-by: Humberto Borba <humberos@gmail.com>
Merge "p1: p1l + p1n = p1ln (fusion)" into cm-10.1