Merge "Remove bcp_dep." am: 6d6d9a8052
am: f8b7372961

Change-Id: Ic5502df3cfd2e0823a81650a45009c4d57fe2a19