42

Change-Id: 101010
Story-Id: 77965678
Cherry-pick some random foobar

Change-Id: 54321
Story-Id: 77965678
Signed-off-by: Ondrej Kupka <ondra.cap@gmail.com>