Merge \"Start primary storage move outside lock.\" into nyc-dev
am: a3290363e1

Change-Id: I35256b066ab041703928052bbfbedb0e8f7afd49