OSLO updates for stable

Fixes bug 1172922
Fixes bug 1159889
Fixes bug 1158319

Change-Id: I6257b5636b7b98d26ee43cbbf6087d9279a5b97c
Merge "OSLO updates for stable" into stable/grizzly