Merge changes from topic "lpdumpd"
am: 384833d0af

Change-Id: I92f6f9f1610b117ccfcb23282e49c31fb87656c3