Merge "Enable auth on AOD2" into qt-r1-dev