Merge \"Prevent PrintRegistry callbacks when finishing\" into nyc-mr1-dev
am: 4b24c48e23

Change-Id: I937876d007e0102e5dcd1f451638543d23941ce6