Merge "Using an increasing request counter instead of system uptime to avoid duplicates when sorting pending updates." into nyc-mr2-dev am: 13f18efb8f
am: d52c1f879d

Change-Id: I8648d102df71c111b0e88effc3fbefb2721a6147