Merge "Unified work lock checkbox should roll back when user cancels confirm...
Merge "Unified work lock checkbox should roll back when user cancels confirm dialog" into nyc-dev am: 4f199459
am: 0710a4c9
* commit '0710a4c9':
Unified work lock checkbox should roll back when user cancels confirm dialog
Change-Id: Ifb3574fc80edb75662baa275b537761c574f6605