Merge "Add tests for setup-bcb and clear-bcb via uncrypt."
am: 4e48a6c1a1

Change-Id: Iaec2a0a3edf3354a030fe921e23acbc97babbb16