Merge "Update asm logging for non-activity sources"