commit something with outdated master

manual merge was necessary for rebase

Change-Id: Ie690554f61cd0fb55db62bd2092ffeb7c48c1ebc