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

Change-Id: I48c0b2b59c48bdaf3c4fed8a03525f1fd2a9cf98