Forgot to push my last changes to the last merge

Change-Id: I8e631e96cf9f83beb7ecb3b81a2e15e4fd3f179e