stuttgart: Complete previous commit.

Change-Id: I9da057c3fd8e24497a914dacee013f6d87f6ae93
Signed-off-by: angelsl <hidingfromhidden@gmail.com>