Merge "Add minimal width and height logging to AM dump." into nyc-dev