Fixes Next wizard button

Closes-Bug: #1255401

Change-Id: I579438528b08f317d5f461755df9e5b81e8f8478
Merge "Fixes Next wizard button"