Merge "Add the -u option to support running on USER builds"