Merge "Add storageId to moveObjects" am: 1f4f6d2a18
am: 18abf57e99

Change-Id: Ieb79d5a10307c47cd772ae5ef621717d5c90cdc2