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

Change-Id: I16823d0088ff725428c3b7fb71c453a3da309e8f