Merge \"registerUpdatedByApp should be synchronized\" into nyc-dev
am: 7595478ff2

Change-Id: I78349914370d1a72f616b4ee8cd7188fe0a416c1