Update with changes from 16.10 codedrop

Change-Id: I3608b45cf47d4f087c4a2c96d13797e193737b70
Signed-off-by: Bernhard Rosenkränzer <Bernhard.Rosenkranzer@linaro.org>
3 files changed