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

Change-Id: I37676540c1271f04ea2a4bcb02ba29d2f8f7f09f