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

Change-Id: Idac9cb8408687f580910fe784802da1b584ade85