Merge "uncrypt: add options to setup bcb and clear bcb." am: e3434279c8
am: 2ae24604d4

* commit '2ae24604d40d4d12b3c670064e027deaba3d8b69':
  uncrypt: add options to setup bcb and clear bcb.