lab fixes

Change-Id: Ie05f22b931e1874b1a961234ee5924a3cbadb0a2
16 files changed