Merge \"Make pinning files async in a background thread\" into nyc-mr1-dev
am: f0df804e0a

Change-Id: Ic32e9e9d9260c18365c29f12cb60ad67a3590a47