Merge "Rename "Bundle" to "Distro"" am: 0ef5727905 am: cb9ea947f3
am: 0038613b82

Change-Id: Id713898f283ecda2f9fb25426c4248bd8e110de8