Merge "Add name and icon for AOD" into pi-dev