Merge changes from topic "lpdumpd"
am: f959fffc1c

Change-Id: I024ccc86df450b21115b76b8062975f2ba18378e