Random Changes

Change-Id: I95ed0a4e6cf160ba8f780d8a3ca2b750e5dc6921
Signed-off-by: Tobias <pahlings@gmail.com>
Merge remote-tracking branch 'origin/master'