Merge "AOD: readd AOD settings on debuggable builds"