Merge "Add error message for locked device." into nyc-dev