Merge changes from topic "lpdumpd" am: 384833d0af
am: 133b475d03

Change-Id: Idc0375283a66bd88bda29df0177c2de28118283f