Merge "registerUpdatedByApp should be synchronized" into nyc-dev