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

Change-Id: Ia09aa0366f6109eb885bb95e7e12b59376bf3d08