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

Change-Id: I483bf716c875bb0743c182b4824f8a388d5d4b15