lazy sh

Change-Id: I8a4f3dd27cd23378a911694e94442c40ee990373
Merge remote-tracking branch 'upstream/kk-ras-mr1' into lichti