Merge "Set oem unlock switch to reflect the actual state of device" into...
Merge "Set oem unlock switch to reflect the actual state of device" into nyc-mr1-dev am: 45fd5c4d am: a5785b72
am: d1a229ab
Change-Id: I3fb9871a6ede2d592e40ce27136d50be396137c9