Merge "Set device lock status from kernel command line."
am: 5952034c25

Change-Id: If7d36a3e1d682ee38aeab2d0dd317cd0cb854c56