Merge changes from topic "lpdumpd" am: f959fffc1c
am: ee7da7c711

Change-Id: Ia75e9367484478b5df5482ce949b9c6b7a89f9c7