Merge "Fix doc flag for device having multiple storages"