Merge \\\"registerUpdatedByApp should be synchronized\\\" into nyc-dev am: 7595478ff2 am: 732053f994
am: 7125801e21

Change-Id: I3ffda71016b3c7b49614697eb3353bf702577e86