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

Change-Id: I6dbf163c1649a503bc706c820a358d67bb33cf16