First try to get it to match master after the matus+sberg changes

Change-Id: Ie82d6efc0e1ce13c5d9d4a1a18d3b5a4616de3e4