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

Change-Id: Id337308ef83dfff10092040da899adcc52de0803