lwp and updater updates

Change-Id: I69db3349f34a033a5836aa911fe702d9d3df8200