Merge "Remove bcp_dep."
am: 6d6d9a8052

Change-Id: I4e5f43cf90376dbf8c7183e34193ff28157f1a6c