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

Change-Id: I074de73a3b93b052bb06655368cfab16f469e44f