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

Change-Id: I9a6dfc42cb4a10f504f9074138ff5c7166e1f4aa