Merge "Handle the race condition when calling uncrypt services." into nyc-mr1-dev am: 473b048cf7
am: 9d5021c2e1

Change-Id: I4ad0e3d0ff361b83b1646c5df15a2821ddcac344