Merge "Dependency cleanup for snapshot .bp" am: 68acec7723 am: 8c2a9e8df3

Change-Id: I20013f6edb3295a1c1a96203be80a38a8f86ded2