Unbreak previous update. Done in pair programming with Niklas. Change-Id: I8ccd5284363f38deac6df522c879867abf583c1a