Merge "Work around a bug in an An app"